bitkeeper revision 1.1159.177.1 (419b7973GQNMdTb87C7Uq9su5ForCA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 17 Nov 2004 16:16:51 +0000 (16:16 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 17 Nov 2004 16:16:51 +0000 (16:16 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk


Trivial merge